Merge
authorIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 25 Jun 2010 14:53:53 +0000 (15:53 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 25 Jun 2010 14:53:53 +0000 (15:53 +0100)

Trivial merge